Move mh-e.texi from emacs22-common-non-dfsg to emacs22-common.

diff --git a/debian/changelog b/debian/changelog
index e61470f065b0facb5e154ce2bd9f7feef69f248f..9b3b83e47ab2c949688a341c0eeba9154db6581a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+emacs22 (22.2+2-1) unstable; urgency=low
+
+  * Move mh-e.texi here from the non-DFSG package because the license does
+    appear to be DFSG compatible.  Thanks to Peter S Galbraith
+    <psg@debian.org>. (closes: #433953)
+
+  * Add Conflicts and Replaces emacs22-common-non-dfsg (<< 22.2+1-2) to
+    debian/control.in to handle move of mh-e.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 20 Apr 2008 13:25:33 -0700
+
 emacs22 (22.2+1-1) unstable; urgency=low
 
   * New upstream release. (closes: #473021, #474271)

diff --git a/debian/control b/debian/control
index 1f480a06d690061200e0ab25824c9b4c37f63343..e3500bddc7c4d86c486b3ef87fcf521e6e57577c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,8 @@ Priority: optional
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
 Suggests: emacs22-el, emacs22-common-non-dfsg
-Conflicts: emacs22-el (<< ${Source-Version}), w3-el
+Conflicts: emacs22-el (<< ${Source-Version}), w3-el, emacs22-common-non-dfsg (<< 22.2+2-1)
+Replaces: emacs22-common (<< 22.2), emacs22-common-non-dfsg (<< 22.2+2-1)
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure

diff --git a/debian/control.in b/debian/control.in
index c201ed486fb035bfe94c79e4b86b5581aedec47f..8fb667f80aef7b71b58110566099a375f6501494 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -71,7 +71,8 @@ Priority: optional
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
 Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), w3-el
+Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), w3-el, emacs22-common-non-dfsg (<< 22.2+2-1)
+Replaces: emacs22-common (<< 22.2), emacs22-common-non-dfsg (<< 22.2+2-1)
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure

diff --git a/debian/dfsg-splitter b/debian/dfsg-splitter
index 1c1fc7e179cfcdeca1c5d3597383dd1cc39ccfce..252b0ce1865056636e002c4d0c7a1fcba4f170c7 100644 (file)
--- a/debian/dfsg-splitter
+++ b/debian/dfsg-splitter
@@ -11,7 +11,7 @@ emacs_archive_name="emacs-22.2.tar.gz"
 emacs_dir="emacs-22.2"
 emacs_version="22.2"
 emacs_major="22"
-deb_src_rev="1"
+deb_src_rev="2"
 
 non_main_dir="${emacs_dir}-non-dfsg"
 
@@ -112,7 +112,8 @@ copy_to_non_main_dir "lisp/version.el"
 
 # man files which appear to be compatible with the DFSG
 dfsg_man_files="
-  faq.texi"
+  faq.texi
+  mh-e.texi"
 
 pushd "${emacs_dir}"
 mkdir ../"${non_main_dir}"/man

diff --git a/debian/patches/handle-dfsg-split.diff b/debian/patches/handle-dfsg-split.diff
index 0e6abb2a3a0b4ee6204382cd3dcb18d26337edf4..de6101edea0faeba9d6649234b314cc67be1cbe9 100644 (file)
--- a/debian/patches/handle-dfsg-split.diff
+++ b/debian/patches/handle-dfsg-split.diff
@@ -59,7 +59,7 @@ Index: sid/Makefile.in
 -           forms gnus idlwave info message mh-e newsticker org pcl-cvs \
 -           pgg reftex sc ses sieve speedbar tramp vip viper widget     \
 -           woman smtpmail url rcirc erc
-+INFO_FILES=efaq
++INFO_FILES=efaq mh-e
  
  # Directory for local state files for all programs.
  localstatedir=@localstatedir@
@@ -185,8 +185,8 @@ Index: sid/man/Makefile.in
 -               pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
 -               speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
 -                 newsticker.dvi emacs-xtra.dvi rcirc.dvi erc.dvi
-+INFO_TARGETS = ../info/efaq
-+DVI_TARGETS = faq.dvi
++INFO_TARGETS = ../info/efaq ../info/mh-e
++DVI_TARGETS = faq.dvi mh-e.dvi
  INFOSOURCES = info.texi
  
  # The following rule does not work with all versions of `make'.
@@ -256,7 +256,7 @@ Index: sid/man/Makefile.in
  info: $(top_srcdir)/info $(INFO_TARGETS)
  
  $(top_srcdir)/info:
-@@ -132,222 +57,11 @@
+@@ -132,222 +57,16 @@
  # to exist in the build directory.
  # In a distribution of Emacs, the Info files should be up to date.
  
@@ -355,11 +355,11 @@ Index: sid/man/Makefile.in
 -pgg.dvi: pgg.texi
 -      $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
 -
--../info/mh-e: mh-e.texi
--      cd $(srcdir); $(MAKEINFO) mh-e.texi
--mh-e.dvi: mh-e.texi
--      $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
--
+ ../info/mh-e: mh-e.texi
+       cd $(srcdir); $(MAKEINFO) mh-e.texi
+ mh-e.dvi: mh-e.texi
+       $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
+ 
 -../info/reftex: reftex.texi
 -      cd $(srcdir); $(MAKEINFO) reftex.texi
 -reftex.dvi: reftex.texi